Merge "SF: Fix thread safety in ISurfaceComposer APIs" into rvc-dev am: 55222d47ee

Change-Id: I69c36eea9b95c455eb913c50216e816cef60026a