Merge changes from topic "am-3b102dd47eed4764b23192ba3873ed95" into udc-dev...

Merge changes from topic "am-3b102dd47eed4764b23192ba3873ed95" into udc-dev am: 241444b4 am: f4db113c

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



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