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

Merge "[automerger skipped] Merge "Map WRITE_SECURITY_LOG permission to gid" into tm-dev am: f76cae75 am: 597056d1 am: 4130b736 -s ours" into tm-qpr-dev-plus-aosp am: 6de7d8f2 -s ours

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

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



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