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

Merge changes from topic "am-d7555e20d3b54c96af761025fa220e64" into udc-dev-plus-aosp am: ff611065 am: 30deabfd

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



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