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

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



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