Merge "Fixed leak of cross user data in multiple settings." into sc-dev am: 23cfbb23d8 am: 6b60c92f38 am: 03107dda06 am: e26cfeee4b am: 362a213a93 am: a021f75920

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

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