tree 18b0e0ba94c0e3dfd24152a4b1ab0214a70b5e4e
parent 8a1b07be03a1bd986a374a98b4233f8a2b4161bf
parent b321bea761da5cd79a69c49f3b87cf929a9ec6ff
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1572980846 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1572980846 +0000

Merge "[automerger skipped] Merge "Have isValidPhoneId and isValidSlotIndex based on activeModemCount." am: 300a0262b9 am: b05c6d8fa6 am: 4fa762e52a -s ours am skip reason: change_id Ia66ee24151d1ec8ecde2dcb4c824a19b4d2cd172 with SHA1 dde04f8f4a is in history"