Merge changes from topic "presubmit-am-87b6f1b094e1464eadf9974cb1848d57" into tm-dev am: 569819ff4d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/17377733

Change-Id: I887a9419022b35126d62a877228c1a2a1a1f8cec
Signed-off-by: Automerger Merge Worker