Merge "Add ability to set onShowListener to custom dialog pref" into pi-dev am: c2120a10f7
am: 2ab853d940

Change-Id: I3d8e378fc347678beaf5be3eda8e382aae88b9b3