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

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



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