[automerger skipped] Merge "Guest mode updates to resolve privacy concerns in...

[automerger skipped] Merge "Guest mode updates to resolve privacy concerns in guest mode" into tm-qpr-dev am: d6e403c5 -s ours

am skip reason: Merged-In I46b8ab527bab8fe665114ed0fffbb06a59d49a77 with SHA-1 5ca368a9 is already in history

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



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