Merge "Merge \\"Teach hard keyboard settings about correct user ID\\" into nyc-dev am: db6f1f2cb5 am: cfe0f07499" into nyc-mr1-dev-plus-aosp