[automerger skipped] DO NOT MERGE Make nav bar button click listeners overrideable am: 9203e45a01 am: f6c928e00e -s ours
am skip reason: subject contains skip directive

Change-Id: I02fba790ca6ab63b38205247f04cc1bb7e083222