Merge "Replace security_context_t type" am: 530329222f am: cdbde55e7b

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1824052

Change-Id: Id934c4e2995134c5e1463e972ca7a2a27050aa2b