Merge "Avoid obsolete uid-state change evaluations in NPMS" into main am: 5b3ef0fd53

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

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