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

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

Change-Id: Ic1aa141040c2b82909eefca7338eadcdd590d78d