[automerger skipped] RESTRICT AUTOMERGE Support split-mode on Note Shortcut am: a896a94e am: 57fd8157 am: 5f624d18 -s ours

am skip reason: Merged-In I90adb9eaf7cb33968db38daa8322ecd8a0a62939 with SHA-1 cb876c5e is already in history

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



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