[automerger skipped] Merge "Merge "Don't test for AppCache callbacks." into oreo-cts-dev am: 44bf78bd56" into oreo-mr1-cts-dev am: 085e95b11b am: 5abf027a38 am: 69f5e378b5 am: 2b27215c3e am: 378e20e68d -s ours

am skip reason: Change-Id Iff215f060387eb5cfd798caa56dcd02ea1e9d7af with SHA-1 48bc939771 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1336025

Change-Id: Ibd6f0a1215ed789ee8760dc811bb160f7cfb9273