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

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

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