Merge commit '561e0b0286912db6ab4522cbb3a40aa4d2e62b21' of sso://googleplex-android/platform/system/sepolicy into HEAD
Change-Id: I8eac7239e2693555125441bfc435547702e6c58d