Merge "Remove unused methods from NMS" into main am: 8aa7286fc6

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

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