Merge "Update the CTS because of the OPTIONS API changed" am: 6d32069433 am: 32900be9d6

Original change: https://android-review.googlesource.com/c/platform/cts/+/1649327

Change-Id: Icbb56dc32d0de9270b656f4976da1fdbfbbe91e6