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

Change-Id: I6a8e7376d0374f7dc11efb164f18ffc16e0b107c