[automerger skipped] Merge "Fix an issue in NPMS where ALLOWED_REASON_SYSTEM will be ignored." am: fe7a49b5d0 am: c888b0b3bb am: 90654c16d3 -s ours

am skip reason: skip tag Change-Id Ic430eed075f466e1c50552053a100809a2780ba7 with SHA-1 59041bd9f4 is already in history

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

Change-Id: I8216f213340eb595642ca92e45a56c3d68a059fa