Merge changes from topic "pii_eid_log-tm-dev" into tm-dev am: 6c4163a1 am: b286b5de

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



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