Merge "Don't write user_switcher_enabled value when enter this Settings" into rvc-dev am: c858484fe6

Change-Id: I9bcb302bfc2602be2242887245c44fa7975402a4