tree aae7f9d4ccc74b0c9a7b80ee0b8a87b4ab687d35
parent 071a02f92e21b2b1fbf09a39f87a472c84e2df2d
parent deab38d5bb6fce549ab08e0e52a6a36b0cf0e63b
author Nazanin Bakhshi <nazaninb@google.com> 1618938826 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618938826 +0000

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

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

Change-Id: I92c9fc5f4dcfc0a7f80db78b885945a1021eab20