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

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

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