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

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

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



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