[automerger skipped] Merge changes from topic "revert-20517233-Cloned User...

[automerger skipped] Merge changes from topic "revert-20517233-Cloned User Storage Issue-tm-qpr-dev-XJICGTXJHD" into tm-qpr-dev am: b9feeee5 am: 6263a552 -s ours

am skip reason: Merged-In I617bae9b201fd66d7b62b6cbd1c48b9f276f1924 with SHA-1 4e65c53b is already in history. Merged-In was found from reverted change.

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

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



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