tree ffaafe24d6e65197cf622664866b81858e6ab99b
parent 30602b58bacce4f2b49fb3f4373b104091971316
parent 4fa762e52ab24f301f869c83a88828680152fd64
author Jack Yu <jackyu@google.com> 1572980628 -0800
committer android-build-merger <android-build-merger@google.com> 1572980628 -0800

[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

Change-Id: Ib03644dc773ab8ef43fc598ed5c079388f659734