Merge changes from topic "QQ3A.200605.002_merge" am: cacd78fef9

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

Change-Id: Ibfbcf71f7297bf8b13a147e4d72c7fa63eb52c0e