Merge "Remove unnecessary locks." am: 804d6c02aa am: 8c4e04c688 am: e04b17ede6

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

Change-Id: I101d235e3de8e728936417acb663bd034e4a6b08