Merge changes from topics "presubmit-am-56d40a423b954793925e985bd6d17f08",...

Merge changes from topics "presubmit-am-56d40a423b954793925e985bd6d17f08", "presubmit-am-996ce7e0335b450491d13bb99f0342a0" into tm-dev am: 2334f8e4 am: 0ee9c14d

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

Change-Id: I803071182e43f8b9e7cf5a5b16fcbb36aeb953d0