[automerger skipped] Merge "Migrated unit tests and added debug messages" am:...

[automerger skipped] Merge "Migrated unit tests and added debug messages" am: fccaace7 am: 1881e1b3 am: b20ec1ba -s ours

am skip reason: Merged-In Ic69a599e609240377dbce2d0b3dca53238035d8e with SHA-1 6e45b623 is already in history

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

Change-Id: Ifcead170cf4d111d5c4aba915487c85e59f9b6e0