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

[automerger skipped] Merge "Fix an issue in NPMS blockedReasons computation logic." into sc-v2-dev am: 32d70b6e am: 1b48fb75 -s ours

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

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

Change-Id: I32892d54746c070ac5f6353b74f888afbee8334e