Merge changes from topic "am-fcae4340eed244c58cf97f06f2a1e30e" into udc-dev am: 228a0071

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



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