Merge changes from topic "am-bfc0f89ad1364c2eb68c831484dca5e5" into udc-dev...

Merge changes from topic "am-bfc0f89ad1364c2eb68c831484dca5e5" into udc-dev am: fa30988b am: a79cb071 am: 3737108f

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



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