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

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



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