Merge "Merge "AndroidTestCase.[set|get]TestContext are added as APIs" am: 5a7fb758 am: 3ae69503" into rvc-dev-plus-aosp