[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 am: 69f70c51 am: 7e97c444

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



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