Merge "Merge "WindowProcessController: optimize locking" into rvc-dev am: 345d68d164 am: 8e2cd35641" into rvc-d1-dev-plus-aosp