[manual merge] [automerger skipped] Merge all "next" commits that are blank am: 3418be82

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



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