Merge "Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule." into...

Merge "Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule." into udc-dev-plus-aosp am: f23ce108 am: 5d510aa1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23563189



Change-Id: I817f4c56c101dd31c3fe7eb37a0a00ef3351e8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>