[automerger skipped] Merge "Fix an issue in NPMS blockedReasons computation...

[automerger skipped] Merge "Fix an issue in NPMS blockedReasons computation logic." am: 37e891fc am: 1af3bf14 am: 9d1e073b am: 1c6a76a5 -s ours am: 5e9b4cb8 -s ours

am skip reason: Merged-In Ibcae147bf4ba84ff91ef7038ffef8c33082b82ca with SHA-1 e9982844 is already in history

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

Change-Id: Ib32f662626aba304b6f9262f29ba6af1dc836906