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 am: 2e03027e am: 4c5e6501

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



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