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

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



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