Merge "Make androidx imports sorted next to android."
am: a9faa65e57

Change-Id: Ia4917684691691413bb9c8fb30616f40879233a7