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

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



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