[automerger skipped] RESTRICT AUTOMERGE Support split-mode on Note Shortcut am: a896a94ed7 am: 57fd815750 -s ours
am skip reason: Merged-In I90adb9eaf7cb33968db38daa8322ecd8a0a62939 with SHA-1 cb876c5e29 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23516147
Change-Id: I616d29e008d7430bc1f38fee30601e6049529362
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: