Merge "Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b455884 am: 356f81b957" into tm-dev-plus-aosp am: df2b24a558 am: 2e03027e18

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

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