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

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



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