Merge "Merge \\"Fix #29073394: Need to bind to scorer after user is unlocked.\\" into nyc-dev am: 464f7e4983 am: 65cc64dfbc" into nyc-mr1-dev-plus-aosp