Merge changes from topic "am-35f3abdcff60461f9f40c6e1f2b745c5" into...

Merge changes from topic "am-35f3abdcff60461f9f40c6e1f2b745c5" into udc-qpr-dev-plus-aosp am: 832f3e4e

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



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