Merge "resolve merge conflicts of 68b2b71f to aosp-main-future" into udc-qpr-dev am: c89b4634

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



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