Merge changes from topic "am-e97270f29bde41b9b31a833787295f9f" into udc-dev am: cdc9f455

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



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