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

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



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