Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" am: 0aa828ab am: a558fae2 am: 20054220 Change-Id: I5fc4382bab5c13f81efb53b06535431549e5a368