am 846362fa: Merge "Use \'dp\' paddings instead of \'mm\' for VPN dialogs" into mnc-dev

* commit '846362fa06e717784e2e60882c83c20a9350b1a7':
  Use 'dp' paddings instead of 'mm' for VPN dialogs