[automerger skipped] Merge "Revert "Expose ACTION_USER_SWITCHED as system...
[automerger skipped] Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" into rvc-dev am: c3752e30 -s ours am: 45f2882e -s ours
am skip reason: Change-Id I426e00e1eb79af5b520fc8c59439614459720fa6 with SHA-1 5a29b044 is in history
Change-Id: I77017ac3be8ac3d14a85b7df65d1aa3615a0c1c0