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

Merge changes from topic "am-eda0d966ad2c44ed98fdb85d1555b595" into udc-dev am: 4bf08f4c am: e85e6f00 am: f1c37beb am: 0417b60b

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



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