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

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



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