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

Merge "resolve merge conflicts of 68b2b71f to aosp-main-future" into aosp-main-future am: b6b5a8c1 am: dcf1a249 am: 520f718d

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



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