Merge "SF: Fix thread safety in ISurfaceComposer APIs" into rvc-dev am: 55222d47ee am: 18d1aca6ad am: b09d5fd378 am: 178ab9fddd am: d50b64b0a6

Change-Id: I35080f5e86eb83e27c694ef888e7bf20baf8a4f3