Revert "[automerger skipped] Merge "Fix CtsStrictJavaPackagesTes..."

Revert "Merge "Fix CtsStrictJavaPackagesTestCases" am: 98b6a42af0"

Revert submission 12662538-am-7ee56e15e2b34e07ab1847af8dfe56f5

Reason for revert: it has two CLs topic, only one of them merged and causing issues.
Reverted Changes:
I642691613:Merge "Fix CtsStrictJavaPackagesTestCases" am: 98b...
I39f7c6c0d:[automerger skipped] Merge "Fix CtsStrictJavaPacka...

Bug: 169254249
Bug: 169209169

Change-Id: I7cda48d0af48338129868ff016de0e00b58533eb
tree: 4b9613959d66d25dc74ab5a7323b703e00cfcc82
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg