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

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



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