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