Merge changes from topic "am-65dc97dc5c204dca84b64a144ce9c692" into udc-dev am: 1cefc021 am: 109763bc

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



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