Merge changes from topic "am-bd6de0ae8590435cb9e3a62065166165" into udc-dev...

Merge changes from topic "am-bd6de0ae8590435cb9e3a62065166165" into udc-dev am: 30052619 am: 4bb50c59

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



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