1896 Add android and androidx to import rule

build.gradle

@@ -31,8 +31,8 @@ spotless {
     java {
         licenseHeaderFile 'spotless.license-java'
         target '**/*.java'
-        googleJavaFormat('1.1').aosp()
+        googleJavaFormat('1.1')
         removeUnusedImports() // removes any unused imports
-        importOrder 'java', 'javax', 'org', 'com', ''
+        importOrder 'java', 'javax', 'org', 'com', 'android', 'androidx', ''
     }
 }

spotless.license-java

@@ -16,4 +16,5 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+ */
+