[automerger skipped] Merge "Update NPMS to listen for all uid procstate...

[automerger skipped] Merge "Update NPMS to listen for all uid procstate changes." am: dfc3abdf am: e91f7dee am: 0d260e60 -s ours

am skip reason: Change-Id I888764ff22fba92fe2cccf3d8442ed318a19ad2a with SHA-1 6831749c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5973e271ce07c81ac37f553f062ab4da3973e9f