Merge "Add android.test.base to class loader context for API version < 30." am: ad02d401ab

Change-Id: Ifa9b4e4d6ea5d01b487882db904e7ab6542133b6