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

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

Change-Id: Iaaa8635c0c1031f6b7e896c879de9744a1215f54