Merge changes from topic "am-68f07433cc324818a871e556630fc136" into udc-dev...

Merge changes from topic "am-68f07433cc324818a871e556630fc136" into udc-dev am: d11f6d29 am: 0269905b

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



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