Merge "Merge "Maintain parity with central surfaces impl." into udc-dev am:...

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

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



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