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

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

Change-Id: I2bf0edb4d3272acd37dc4a7d169e398893c17f3d