Merge changes from topic "am-8d8614a8392c475abefecc15701766a4" into...

Merge changes from topic "am-8d8614a8392c475abefecc15701766a4" into udc-d1-dev-plus-aosp am: adf78ea8

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



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