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