tree c8fdc825d676a08b7fc940e71f106765517793b2
parent cd644e6f2b7b0c0393e61a70cf006cc5ea4977f6
parent 8dbfbf7400fabcf2b913a27e90f8b3f27555a25e
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1586311019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586311019 +0000

[automerger skipped] Merge "multiSimAllowed should be consistent with max active modem property." am: 2641543774 am: f4804c9e92 -s ours am: 94664fd08f -s ours am: 8dbfbf7400 -s ours

am skip reason: Change-Id I2d38dd9a0a860ee451fe51372a62c2910b88c88f with SHA-1 ba874c6827 is in history

Change-Id: I639a177003e9ea175e6230080ce257e5f12e8a0a