Merge "Fix punch hole wrong position during rotation" into tm-dev am:...

Merge "Fix punch hole wrong position during rotation" into tm-dev am: a62d58a7 am: 1ecfb2b7 am: 73f46609 am: 6cb61020

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



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