Merge "resolve merge conflicts of 68b2b71f to...

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

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



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