Merge "Make aosp-main-future in sync with goog/main" into aosp-main-future am: b7c7423f

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



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