Merge "Ignore older UID state change callbacks in NPMS." into tm-dev am: 1e96db49dc am: ebda7515f1

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

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