Merge "Use custom action key icon" into udc-qpr-dev

tests/unit/src/com/android/settings/inputmethod/KeyboardSettingsFeatureProviderImplTest.java

@@ -57,4 +57,9 @@ public class KeyboardSettingsFeatureProviderImplTest {
 
         assertThat(mFeatureProvider.addFirmwareUpdateCategory(mContext, screen)).isFalse();
     }
+
+    @Test
+    public void getActionKeyIcon_defaultValue_returnsNull() {
+        assertThat(mFeatureProvider.getActionKeyIcon(mContext)).isNull();
+    }
 }