Merge changes from topic "am-c87b022de5ba47cb88def16514082657" into...

Merge changes from topic "am-c87b022de5ba47cb88def16514082657" into udc-d1-dev-plus-aosp am: 8bf75ae4 am: 592bf57e

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



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