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

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

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