[automerger skipped] Merge "DO NOT MERGE Make nav bar button click listeners...

[automerger skipped] Merge "DO NOT MERGE Make nav bar button click listeners overrideable" into qt-qpr1-dev am: 7598ae8f am: 2843704a -s ours
am skip reason: subject contains skip directive

Change-Id: Id8f6a992cbcd27d6af4169e201d04dc1e28009b1