Merge changes from topic "am-142d4f4f2407456e9aabb5f97eb0e9ca" into udc-dev am: d9d6622f

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



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