Merge "Replace security_context_t type" am: 0568338670 am: 760547e263

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1827242

Change-Id: I06184926d64ca1b7582ce593fb90d5392e7dd43f