[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

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



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