am 0ab62de3: Merge 79b8f0b7

* commit '0ab62de3e8d00c6d1ed9c7cc67a41125468b1c05':
  Adding xhdpi version of app icon. Bug: 6596419