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

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

Change-Id: Ia0a79dc25e9bc08e572fa5a37fb5f821bd7bbfcf