Merge "RESTRICT AUTOMERGE Support split-mode on Note Shortcut" into udc-dev...

Merge "RESTRICT AUTOMERGE Support split-mode on Note Shortcut" into udc-dev am: 9087af02 am: 0741c853

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



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