[automerger skipped] Merge "Preload android.test.base to improve startup...
[automerger skipped] Merge "Preload android.test.base to improve startup performance" into rvc-dev am: dcd5bcaf am: c83243d3 -s ours
am skip reason: Change-Id I28ac1544c20bc3e8abb4341aa331c212f16301f0 with SHA-1 5ec5409a is in history
Change-Id: I536a9c434a3899239ee483de29a6270d490081e5