Merge "Allowing activity occludes keyguard if activity has showWhenLocked flag" into tm-dev am: 9e7f7c11 am: 3c6d192a

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

Change-Id: I5aef56183baa3ac86c8859f042538674dceb3f59