Merge "Refactor code incompatible with Mockito 2.7.13"

...ediaframeworktest/integration/CameraDeviceBinderTest.java

...om/android/mediaframeworktest/unit/MediaInserterTest.java

.../android/settingslib/users/AppRestrictionsHelperTest.java

...tests/src/com/android/server/NetworkScoreServiceTest.java

...s/src/com/android/server/NetworkScorerAppManagerTest.java

.../android/server/accessibility/KeyEventDispatcherTest.java

...oid/server/accessibility/MagnificationControllerTest.java

...android/server/accessibility/MotionEventInjectorTest.java

.../android/server/devicepolicy/DevicePolicyManagerTest.java

...stests/src/com/android/server/devicepolicy/MockUtils.java

...id/server/policy/AccessibilityShortcutControllerTest.java

.../android/server/retaildemo/RetailDemoModeServiceTest.java

...c/com/android/server/webkit/WebViewUpdateServiceTest.java

...ts/src/com/android/server/wm/TestWindowManagerPolicy.java

...rver/pm/shortcutmanagertest/ShortcutManagerTestUtils.java