Merge "Clear binder id after a permissions check before killing a UID." into mnc-dev