Merge "Add LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK permission to Shell" am: 9b6a363c8c am: c15f518369

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

Change-Id: I814281ec1817d61b5a8d454cf422c57963c8acb0