Merge "Refactored ExtendedMockitoTestCase into ExtendedMockitoRule" into udc-dev am: d2485b0b am: a2de4953

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



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