Merge "Merge "Maintain parity with central surfaces impl." into udc-dev am: f3192865 am: 3bdb3287" into udc-d1-dev-plus-aosp am: 8bae2042

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



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