[automerger skipped] Merge "Revert "Revert "Fixed UserVisibilityMediator...

[automerger skipped] Merge "Revert "Revert "Fixed UserVisibilityMediator profile scenario.""" into udc-dev am: 1a8c7c14 am: 3b2b2724 -s ours

am skip reason: Merged-In Ibf0c9aa62c8aaf938dbea27a486325c4b68ce5eb with SHA-1 98cc6695 is already in history

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



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