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

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