[automerger skipped] Merge changes from topic "data_activity" am: 4fd2f2a9 am: b41fd73f -s ours

am skip reason: Merged-In I482fdb4f8a263af159ef7e47c1018f5d54ff076b with SHA-1 bcee1bc1 is already in history

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



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