Merge changes from topic "am-623aca2596aa488fbd2de6b269e00acc" into udc-d1-dev-plus-aosp am: 973e81ff

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



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