[automerger skipped] Merge changes Ifb1e44bd,Ic2632a12 into pie-cts-dev am: 23a906dbce am: 72eb05e7d3 -s ours

am skip reason: Change-Id Ifb1e44bdb2201859532e9b6cd340ff9209046d04 with SHA-1 720f458bac is in history

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

Change-Id: I924419f06f35a59dcf087663e32e11fda6bd4d32