Merge "Allow system_server to write to bpf maps" am: b761636b9d
am: ac0b2ee2fd

Change-Id: I8dfe3ff0fd13e905619147d5d03218bf8a217a22