[automerger skipped] Merge "RESTRICT AUTOMERGE Fixed leak of cross user data in multiple settings." into rvc-dev am: 990b6c6625 am: 1b01a94954 -s ours am: db45fd3600 -s ours am: d330d9180f -s ours am: 88ecafce69 -s ours am: 0327a28c7b -s ours am: fced41298f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/23515301

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