[automerger skipped] Merge "Revert "Add test for bug 64710074"" into oreo-mr1-cts-dev
am: e72a65a42f  -s ours

Change-Id: I05dfd51cc34fa8a1f02199bc60d3368fda2a12ef