am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"

* commit 'baed0a8f0b43191c8f001e064ff42cf27a305d87':
  Implement resolving of icon attributes to resIds in AlertController