Merge changes from topic "am-fe5ae2a7d3314c3690704daee5743bf8" into udc-dev am: 9989497f am: 72ddd207

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



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