Merge changes from topic "am-8b32e0f40c3d4206b024560c62beaf38" into udc-dev...

Merge changes from topic "am-8b32e0f40c3d4206b024560c62beaf38" into udc-dev am: c37a86ec am: db610203

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



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