[automerger skipped] Migrated unit test cases am: bcbe5e16 am: 63bd3086 -s...

[automerger skipped] Migrated unit test cases am: bcbe5e16 am: 63bd3086 -s ours am: 23f45c44 -s ours

am skip reason: Merged-In I8cf90be437ff7ed886b059eaa5cb71785a50c8d2 with SHA-1 014506e1 is already in history

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



Change-Id: I203318dde2b09564cfd4b967928debfd0d4a8a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>