Merge "WifiManagerTest: Allow removeAppState on R devices" into sc-dev