Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" am: 0aa828ab5d am: a558fae2e7

Change-Id: Id8dc85c76023473413be799e079d91b10e67babf