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

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

am skip reason: subject contains skip directive

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



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