am fc470076: Merge "AOSP change for showing the app icon."

* commit 'fc470076741a61a7133590d63fc5241ee1343d2e':
  AOSP change for showing the app icon.