[automerger skipped] Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev am: cf845f365c
am: 9c6ccfbb4a -s ours
Change-Id: Ie2482ef0da93306300b1c15e6a1cec8fff4d43b5
This commit is contained in: