[automerger skipped] Merge "Preload android.test.base to improve startup performance" into rvc-dev am: dcd5bcaf10 -s ours am: c22fd252f1 -s ours am: 0a1ab383ec -s ours am: d6bcdbade2 -s ours
am skip reason: Change-Id I28ac1544c20bc3e8abb4341aa331c212f16301f0 with SHA-1 0c57079427 is in history
Change-Id: I043eaaed59050764287f7dd80cfefceb33b8fb13
This commit is contained in: