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

Change-Id: I2de8c56981abdc3795b03e6588cbc60a28db37c0