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

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

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

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



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