Merge "Track system server permission change" am: 2cf89ae027 am: 52b3ad3249 am: eed5099341

Change-Id: I4901bb8f8f5a9cc27e0a22044632a5d26120adc4