Merge changes from topic "am-e7548621bdb246cba799478a90d4b408" into udc-dev am: 4eb3a6f4

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



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