Merge "Avoid setting class/method when testPackage is set" into oreo-mr1-cts-dev