Merge "Replace security_context_t type" am: 8bf8b19e84 am: 2130d975b5 am: 1416426806 am: 49ee150b00

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

Change-Id: I15a6586b063ae6cd667e68e495d2b3260456d7ca