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

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

Change-Id: I944481dc367f3212285535543d57a8212e11da07