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: I6e0012fab6e4c14665e0b03aea78a59834da286d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>