Merge changes from topic "am-cf421821fa0143fcba5fc7d1d42889f6" into udc-dev am: 240c3926 am: be372daf

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



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