[automerger skipped] Merge "Use registerIgnoringScore" am: 2dfea34f am:...

[automerger skipped] Merge "Use registerIgnoringScore" am: 2dfea34f am: ef9aae38 -s ours am: 6cd8699e -s ours am: a97bcfdd -s ours

am skip reason: Merged-In I0acb338d608016f2e144685f9088bf1384dea25f with SHA-1 f511ec9a is already in history

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

Change-Id: I6f0670226a55a2c58a92c58cb6eebc30c8024e4c