Merge changes from topic "revert-20517233-Cloned User Storage...

Merge changes from topic "revert-20517233-Cloned User Storage Issue-tm-qpr-dev-XJICGTXJHD" into tm-qpr-dev am: b9feeee5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20674384



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