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

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



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