Merge "Fix primary activity untouchable with punch hole" into udc-dev am:...

Merge "Fix primary activity untouchable with punch hole" into udc-dev am: 385ab324 am: 12c5add6 am: 770b69f6

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



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