Merge "Merge "Reset mock NM before each of the tests that checks it" into...

Merge "Merge "Reset mock NM before each of the tests that checks it" into tm-dev am: 1df465ed am: 90deedf9" into tm-d1-dev-plus-aosp am: bc4d9a42

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



Change-Id: I8f06a46db035a361dd115407c5fcb49a39192655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>