Merge changes from topic "am-68f07433cc324818a871e556630fc136" into udc-dev am: d11f6d29 am: 728cf288

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



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