[automerger skipped] Merge "RESTRICT AUTOMERGE Support split-mode on Note Shortcut" into udc-dev am: 9087af02 am: 0741c853 am: 33aa45ef -s ours am: af5b792d -s ours

am skip reason: subject contains skip directive

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



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