[automerger skipped] Merge "Update size compat restart button surface position...

[automerger skipped] Merge "Update size compat restart button surface position after display insests changed" into sc-v2-dev am: 6ee7e8b6 am: 1b5d6245 -s ours

am skip reason: Merged-In Icda54db231783f576832b22e4d286fe0524a2088 with SHA-1 e048e696 is already in history

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

Change-Id: I5c3de3aaed4d7810cfeb64451d4d9a7ac76cb294