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

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



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