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

Change-Id: I61851a57daef4dbd774007e6b4e8de6376fb4d59