Merge changes from topic "am-f78927f844034409949b75e8a9f38b93" into udc-dev-plus-aosp am: 4660f302 am: 0bb478c8

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



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