Merge "Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b4558 am:...

Merge "Merge "Map WRITE_SECURITY_LOG permission to gid" am: 2b2b4558 am: 356f81b9" into tm-dev-plus-aosp am: df2b24a5

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



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