Merge "UserController: add UserHandle extra to user switched broadcast"
am: 55593ee940

Change-Id: I7f5d437c34fc08e2c7be096bdea914877d1fb718