Merge "Add BIND_IMS_SERVICE permission to the shell" am: 00e669c96e

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

Change-Id: I8c564b0d9d2e2b75cc601238ee22efb88a373c2e