Two commits conflicted and the bots didn't catch it somehow

Bug: b/163854287
Change-Id: Idb4d7802eec71b2112b11e4553e609b532cee070
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2369261Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>