Merge changes from topic "am-c5c629247f744a708fc8c36c98061b9e" into udc-d1-dev-plus-aosp am: 133914ed

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



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