Change test type from InstrumentationTest to AndroidJUnitTest

Details about test configs changes are tracked in doc
https://docs.google.com/document/d/1EWUjJ7fjy8ge_Nk0YQbFdRp8DSHo3z6GU0R8jLgrAcw/edit#

Bug: 35882476
Test: local test
Change-Id: Icce2ff1cc424a1e021f30ea525f5256403899583