Merge "Expose ACTION_USER_SWITCHED as system API" am: e69e147657

Change-Id: Idfb18d0ec6ee68a501b027a266350a0f794011ca