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