Merge "Add android.test.base to class loader context for API version < 30."...
Merge "Add android.test.base to class loader context for API version < 30." am: ad02d401 am: 6200c519 am: a5b04505 am: d9695d8b am: 0070ec2c
Change-Id: I892bf0b3ec4ce6c05669d2b99645a625ded29d73