Merge "NPMS lock improvement." am: 053893568a

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

Change-Id: I961b2ea8aead71b92241496fd24d12fc301b13bf