Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp am: 0ac697cb

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



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