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