Merge changes from topic "am-e66d5989b6844d95b2acd5b3553d1017" into udc-dev am: 0c233eb4 am: df4a9a3e

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



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