Fix CtsStrictJavaPackagesTestCases
Bug: 166680653
Bug: 164173744
Test: atest CtsStrictJavaPackagesTestCases
atest CarServicesTest
Change-Id: I5bd3ba2fd3b62a0e06d4322602631972f7e4a8bc
Merged-In: I5bd3ba2fd3b62a0e06d4322602631972f7e4a8bc
Metged-In: Ide17ccbcd12fe07cf6e3cf60a4126d090e0153d4