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: 94ae5c69 am: 45324892

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



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