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

Change-Id: I6136a3c5eb0e18f3bacf0d644715cd6dadac680f