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

[automerger skipped] RESTRICT AUTOMERGE Support split-mode on Note Shortcut am: a896a94e am: 79cd6cee -s ours am: f31f3de8 -s ours am: d9f0d528 -s ours

am skip reason: subject contains skip directive

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



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