[automerger skipped] Merge changes from topic "data_refactoring" am:...

[automerger skipped] Merge changes from topic "data_refactoring" am: 3266b0d6 am: 8a795390 am: 7ca66468 -s ours am: 217d9eec -s ours

am skip reason: Merged-In I35ecca5396e6bc2b87a902f26435c16d7963fe12 with SHA-1 a74e9a42 is already in history

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

Change-Id: I69335875f78656fb3e17665702fbe84de202ad9e