Merge changes from topic "am-93ebdb9c83cd4ab99a7cb222f03a27b2" into...

Merge changes from topic "am-93ebdb9c83cd4ab99a7cb222f03a27b2" into udc-d1-dev-plus-aosp am: 4f15220d

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



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