Merge changes from topic "am-5b55b13a30a4482fa3243193fdd1268f" into udc-dev-plus-aosp am: 529e2a5a am: f99a9193

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



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