Merge "Make CtsStrictJavaPackagesTestCases pass on Q" into rvc-dev