Merge changes from topic "am-29387cd2e0444c44bc82eeadb1c74382" into...

Merge changes from topic "am-29387cd2e0444c44bc82eeadb1c74382" into udc-d1-dev-plus-aosp am: 451fc15e

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



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