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

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

Change-Id: If43c9a1362384c3498d37ebe93cc89bef1c59ef4