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

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

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