Merge changes from topic "am-f38f841984ba45d5b4f861e6f78d4e93" into udc-dev am: a630d06a -s ours

am skip reason: Merged-In I2b668d1cd875657b27a1d52bda21f238d7020862 with SHA-1 e422b7da is already in history

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



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