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

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



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