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

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



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