[automerger skipped] Merge "NPMS lock improvement." am: 05389356 am:...

[automerger skipped] Merge "NPMS lock improvement." am: 05389356 am: cada1764 am: 388fe5f6 am: adb3c332 -s ours

am skip reason: Change-Id Ibbb4325c7380a2febf3682b3ae3436647ae82e16 with SHA-1 6030b668 is in history

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

Change-Id: I585390decb4b6db6bc0d9469fe8ff2329b5308da