am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev

* commit '748902420d26b2868296303be7df89d0c25b7f2b':
  Don't override dialog icon drawable unless valid resource ID was set