Merge "NPMS lock improvement." am: 053893568a am: cada17643d

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

Change-Id: I2ba5d0c42f9d5cfa9fa64996a7fcb9ce2c7a8f76