Merge "Fix locked profile activity hiding logic" into udc-dev am: 0f74f7d7 am: 0ecc3603

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



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