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

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

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