Merge "Update size compat restart button surface position after display insests changed" into sc-v2-dev am: 6ee7e8b6b3

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

Change-Id: Ia082aa3db3d4e846752d018e9d53ed4f96bb1df5