[automerger skipped] RESTRICT AUTOMERGE Support split-mode on Note Shortcut...

[automerger skipped] RESTRICT AUTOMERGE Support split-mode on Note Shortcut am: a896a94e am: 0a6b89a4 -s ours

am skip reason: subject contains skip directive

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



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