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

Change-Id: I0f1c61349b5836f8ed7581a9ed513c5a461e7e24