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: 506e2dfa

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



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