am 7a670250: Merge "Add system partition check for vpn dialogs" into klp-dev-plus-aosp

* commit '7a670250c9541e41fd450a70f539cafec2d6028b':
  Add system partition check for vpn dialogs