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

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

Change-Id: I0a60ccaed69fa0095e524695a71325743475f3ac