Merge "Match phoneId in the record if the subId is invalid" am: 0257be94 am: 7377ef54 am: b06228b7 am: 57a3156b

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1871153

Change-Id: Id10e73edea6758081f5a73ad4e094c1ae22d1b92