This is a follow up of crrev.com/c/2282277. To avoid ANGLE roll failure,
crrev.com/c/2285839 should be landed first.

Bug: None
Change-Id: I41ece21af4b689150d82b0b1bc7eaae21ce23fed
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2286811Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jiajie Hu <jiajie.hu@intel.com>