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" into udc-mainline-prod am: c3107007

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



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