am 5fdf78d4: (-s ours) am 5e3334b7: Merge "Add ACCESS_IMS_CALL_SERVICE permission to phone process." into mnc-dev

* commit '5fdf78d42bb5cb158439c3acffc01df0c1298759':