Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425



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