DO NOT MERGE am: d35a9ac7 am: ae2e7676 am: 6a73b22f

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



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