Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 am: ec82033d3e am: 4bf2a8e322

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

Change-Id: I2440cd31445f66534844958b5ee50cd8b6b641d1