Merge "Remove unnecessary locks." am: 804d6c02aa

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

Change-Id: Ie41ef7b84158f929476875f807ac0529ee61bcec