Merge changes I20405787,Ia906d2e1 into oreo-mr1-cts-dev am: 95b5568f11 am: 8f8f24d8ea am: b4b8837d68

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

Change-Id: I3898ebe10e64ba713bb4e1418c9a8500e07560b9