[automerger skipped] Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK...

[automerger skipped] Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" am: 9b6a363c am: c15f5183 am: 467fc191 am: f4117748 -s ours

am skip reason: Merged-In I8bedd571a4d3385042533fe7dd5ded250894d14a with SHA-1 7cf5afa7 is already in history

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

Change-Id: I75ad396589329df60b267021ad33232b8f2176e6