Merge changes from topic "am-9af56d16cfef496aa0460f278b25bf8b" into udc-dev am: 0b728844

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



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