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

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

am skip reason: subject contains skip directive

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



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