Merge "Use activity context to get display in CtsPreferenceTestCases" into rvc-dev