Merge changes from topic "am-b294cc98c84e4a4d9e436ce8fd23c783" into udc-dev am: 4b1ea9c2

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



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