Merge changes I20405787,Ia906d2e1 into oreo-mr1-cts-dev am: 95b5568f11 am: 8f8f24d8ea am: b4b8837d68 am: b510e6c9d6 am: 1231f4495f am: ce0c9926c2 am: a28cf2a1fe

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

Change-Id: Icb29948f2c7130622a8dd69ad765abac80d651ae