[automerger skipped] Merge "Revert "Expose ACTION_USER_SWITCHED as system API"" into rvc-dev am: c3752e30f0 am: 085df0da3c am: 2d7901f88b am: 4bfbc8dbc7 -s ours
am skip reason: Change-Id I426e00e1eb79af5b520fc8c59439614459720fa6 with SHA-1 9e9f7a6e93 is in history
Change-Id: I91eafdec9ef03f0980d8f0cc80b9380341a704e0
This commit is contained in: