Merge "Reset mock NM before each of the tests that checks it" into tm-dev am: 1df465ed29 am: 90deedf949
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282484 Change-Id: I9e7a09eed9656a572b7927e5553a52fafa7f1cbe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: