Merge changes from topic "am-873fae688f784c10b009f21f4800ecf7" into...

Merge changes from topic "am-873fae688f784c10b009f21f4800ecf7" into udc-dev-plus-aosp am: ef04f299 am: 6e5a5176

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



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