Snap for 4693621 from a098a2873549a4d5eaf0b7c6fc77ee79edf349a5 to pi-release

Change-Id: I5f5c61eb0de0baf811b281d6324f9d9b81d884d1
diff --git a/default-treewalker-checks.xml b/default-treewalker-checks.xml
index 8ae9f56..7e09891 100644
--- a/default-treewalker-checks.xml
+++ b/default-treewalker-checks.xml
@@ -158,7 +158,7 @@
 <module name="ImportOrder">
   <property name="severity" value="error"/>
   <message key="import.ordering" value="Wrong order for {0} import. Use Ctrl+Shift+O (Eclipse) or Ctrl+Alt+O (Intellij) to sort imports. https://source.android.com/setup/code-style#order-import-statements"/>
-  <property name="groups" value="android, com.android, dalvik, com, gov, junit, libcore, net, org, java, javax"/>
+  <property name="groups" value="android, androidx, com.android, dalvik, com, gov, junit, libcore, net, org, java, javax"/>
   <property name="ordered" value="true"/>
   <property name="option" value="top"/>
   <property name="separated" value="true"/>