Merge changes from topic "am-b7d7cd642aea493fa4b5f4528ef42d31" into udc-d1-dev-plus-aosp am: 5515c1db

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



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