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

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