Merge changes from topic "am-99e883e856064d17ba153ec8074ac96d" into...

Merge changes from topic "am-99e883e856064d17ba153ec8074ac96d" into udc-qpr-dev am: 4cdfacac am: 5e165c7e

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



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