Merge "Expose ACTION_USER_SWITCHED as system API" am: e69e147657 am: 7aadbe0e75

Change-Id: I216dffa9b2f58a469637358376d7f99f7c2a78c7