Merge changes from topic "am-2879e0be5fd94b46a936a8b86ad29c09" into...

Merge changes from topic "am-2879e0be5fd94b46a936a8b86ad29c09" into udc-qpr-dev-plus-aosp am: d9e203ff

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



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