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

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

Change-Id: I6db0b69e916401d7116c427015a8ecd9746e93ef