[automerger skipped] Merge "Remove deprecated NMS methods from V" into main...

[automerger skipped] Merge "Remove deprecated NMS methods from V" into main am: 0dfbd68f -s ours am: fa89e38f -s ours am: 99cae8ff -s ours am: a7a44075 -s ours

am skip reason: skipped by user sorinbasca

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



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