[automerger skipped] Merge "RESTRICT AUTOMERGE Support split-mode on Note Shortcut" into udc-dev am: 9087af02 am: 0741c853 am: 33aa45ef -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: I2552b5a83e4df653cb2701e15919afe6b6aadc72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>