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

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

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



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