Merge changes from topic "am-53db5478792d456580d80470f2cd0b2f" into...

Merge changes from topic "am-53db5478792d456580d80470f2cd0b2f" into udc-d1-dev-plus-aosp am: 629b79b3

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



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