Merge "Migrate from the support library v4 to AndroidX" am: 7667af5220 am: d816a6cb2e am: e2214dc2aa
am: a4a241e589

Change-Id: I926a273394985bd64731fc3b84066616aaf0b60a