Merge changes I54269a72,I67c43f6f,I47f3b1db into pie-cts-dev am: 0b8f0c312b am: 6f468ee0b0 am: 4e1d5e2c41 am: b8dea1ed83 am: 8417a18b20

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

Change-Id: Id12fa4af1e6169e69abd231b0b3cc7e76974dff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>