Merge "RESTRICT AUTOMERGE Fixed leak of cross user data in multiple settings." into rvc-dev am: 990b6c6625

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

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