[automerger skipped] Merge "Map WRITE_SECURITY_LOG permission to gid" into...

[automerger skipped] Merge "Map WRITE_SECURITY_LOG permission to gid" into tm-dev am: f76cae75 am: 597056d1 -s ours am: 9d6957aa -s ours

am skip reason: Merged-In Ifde2e5192326f0811807dcb05563b1b5b63077ce with SHA-1 e806776e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18603750



Change-Id: Ib1c98d867418bdad7fb0488acc901bc18445b0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>