[automerger skipped] Merge "Refactored how CachedAppOptimizerTest uses...

[automerger skipped] Merge "Refactored how CachedAppOptimizerTest uses ExtendedMockitoRule." into udc-dev-plus-aosp am: f23ce108 am: 5d510aa1 am: 662d85b2 -s ours

am skip reason: Merged-In I16b15dbb984eae561a38e8b389ad8c4e36adfb59 with SHA-1 c9087a30 is already in history

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



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