Merge "Update language to comply with Android's inclusive language guidance" am: c0d28b0f96 am: da02fb34b7

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1375043

Change-Id: I497a616313d2f9465f9a33fc296cd26ded64c835

tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java

@@ -46,7 +46,7 @@ public class ChooseLockPatternTest {
 
     @Test
     public void activityCreationTest() {
-        // Basic sanity test for activity created without crashing
+        // Basic test for activity created without crashing
         Robolectric.buildActivity(ChooseLockPattern.class, new IntentBuilder(application).build())
                 .setup().get();
     }