Merge "Add STATUS_BAR_SERVICE permission to phone uid" am: 056b8e37e8 am: 12c89a5bb7
am: e33c17f406

Change-Id: I8d23b6c0edd670a04c7973772004117c762e58f0