Merge "Add steventhomas to surface flinger owners file" am: 451f3b5175 am: 00007148ce am: 33b06fe7e9

Change-Id: I9c5760115794b46559f62cf1aacdadffc9b3966a