[automerger skipped] Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK...

[automerger skipped] Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" into sc-v2-dev am: 5fc0e28f -s ours am: dc4c0fbb -s ours

am skip reason: Merged-In I8bedd571a4d3385042533fe7dd5ded250894d14a with SHA-1 0d7cc7a8 is already in history

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

Change-Id: Iaac68a061427ae5f67b0cccf74cd9f051c11f760