Merge "Allow multiple (sequential) adb users on Linux. am: 75f42d7ea7 am: 2e579ca920" into nyc-mr1-dev-plus-aosp