Merge "Map WRITE_SECURITY_LOG permission to gid" into tm-dev am: f76cae7532 am: 597056d1b0

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

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