Merge "Update NPMS to listen for all uid procstate changes." am: dfc3abdf72 am: e91f7deefa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5208b7648e99ead1b1329f32f1d9b9774a511c60