Merge "Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev am: 8e2a2fa98c am: 5df763e177" into nyc-mr1-dev-plus-aosp
am: 14d77d69a8

* commit '14d77d69a8d63655022d681cdb0f2afbca3058c7':

Change-Id: I185aa92075b5df705ce5651d370ec8ed73a07860