Merge "Merge "Don't test for AppCache callbacks." into oreo-cts-dev am: 44bf78bd56" into oreo-mr1-cts-dev am: 085e95b11b

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

Change-Id: Ic7de65abc036499334c0e1d715e840b03eccf050