Merge changes from topic "am-391c166e52474daab78af5eb8cc04d0c" into...

Merge changes from topic "am-391c166e52474daab78af5eb8cc04d0c" into udc-qpr-dev-plus-aosp am: c0a1fab1

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



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