[automerger skipped] Ignore older UID state change callbacks in NPMS. am: efa4f74236 am: 2a4f9d6db5 am: b013bf1bb0 -s ours

am skip reason: Merged-In I631f5e01f6627916a96c930c22849a1d11eab636 with SHA-1 b57c865855 is already in history

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

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