Merge changes from topic "am-68f07433cc324818a871e556630fc136" into udc-dev am: d11f6d29 am: 5db4c717

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



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