Merge changes from topic "am-1b9e8ba39c5043f49190384b51db718c" into...

Merge changes from topic "am-1b9e8ba39c5043f49190384b51db718c" into udc-qpr-dev am: 5909b534 am: 695d2039

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



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