Merge "Add system partition check for vpn dialogs" into klp-dev-plus-aosp