Merge changes from topic "am-733a5c7406264a459a0a2894b8b96d63" into...

Merge changes from topic "am-733a5c7406264a459a0a2894b8b96d63" into udc-d1-dev-plus-aosp am: 40a6a3fe am: bceba523

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



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