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

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

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



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