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: b0af23c7 am: f92e3d34 am: 6a9808d4

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



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