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

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

Change-Id: Iaae68dd8c7a6ed7684146520bd4c6c369e8870a9