Merge changes from topic "am-3d6b5fcccce64243ab603f962643afd3" into udc-dev-plus-aosp am: 8094222e am: 727ed94b

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



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