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

Change-Id: Ie445f0204aa76240a6a69c38b4c656080ac83b17