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 am: 7cda0772

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



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