Merge "Merge "AndroidTestCase.[set|get]TestContext are added as APIs" am:...

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1321316

Change-Id: I323bf5f05631297f361782ba512c303d690ad745