Merge changes from topic "am-fe5ae2a7d3314c3690704daee5743bf8" into udc-dev am: 9989497f am: 0d2a92f1

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



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