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

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



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