[resolved conflict] Merge "Remove deprecated NMS methods from V" into main am:...

[resolved conflict] Merge "Remove deprecated NMS methods from V" into main am: 0dfbd68f am: a0258a23

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



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