[automerger skipped] Make aosp-main _mostly_ in sync with goog/main am: e2e8012f -s ours

am skip reason: Merged-In Ie9c5deb25ec5f8594feac15b2a3f41b40a65e4f0 with SHA-1 1d74c21f is already in history

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



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