Merge "Replace security_context_t type" am: 8bf8b19e84 am: 2130d975b5

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

Change-Id: I088bc22e7102bf883881ed7b9429704c9fbac8f7