am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless...
am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev
automerge: 74882cb0
* commit '74882cb0':
Don't override dialog icon drawable unless valid resource ID was set