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

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

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