Merge "Track system server permission change"
am: 2cf89ae027

Change-Id: I0418dde737c07142a6016823f1604e94dcbf11eb