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: I1086dba371d9a1b1727411297c21cf565cdb0215
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>