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

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



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