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

Change-Id: I06fddba7f72558bdc2b32fb768e550317264dbfe