Merge "More granular locks." am: 38a129962a am: 293e5252df am: 97740d88a0

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1898571

Change-Id: I6ab84486696ae30436353f474966da49e424ffb6