Merge "Refactoring and mocking to make sure unit test doesn't call the real service" am: 348f5cb01e am: 3779168261

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

Change-Id: I1a398667cc0a51d0454fb956be8f08871c23af6e