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

Merge changes from topic "am-3a8c44cad77b4776b97ef35c53ba858a" into udc-dev am: 4638478f am: 2a387e83

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



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