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

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



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