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

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



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