Merge "Match phoneId in the record if the subId is invalid" am: f2fb698ea5 am: 0eef459622 am: 4ce76961a4 am: cfe2224e0b am: 214a653178
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1870938 Change-Id: I5f361f3bbfe69d2747aa08293d34d33d17d4ab78
This commit is contained in: