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

Change-Id: I5e5915824484ecf9f7c9375677ac86d6f01875f5