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

* commit '515a8406aa649fb5ea63a79f697eb04afadf4a3d':
  Use 'dp' paddings instead of 'mm' for VPN dialogs