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

Change-Id: Ie98e973e09760862c919cc16a0c43b232c191960