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

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



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