[automerger skipped] Merge "DO NOT MERGE Fix error where androidx targets were being used." into pi-dev am: f7416d1fe0
am: a2f5b6ca6b  -s ours

Change-Id: I7a07e66f6386d6f8d69acf323723929e69c1f716