Merge "Revert^3 "Build userdebug_plat_sepolicy.cil with Android.bp""