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

Change-Id: I5e70284b9909d17cc81d78552fb5870e6fdb4fda