[automerger skipped] Merge changes from topic "QQ3A.200605.002_merge" am: cacd78fef9 am: c149919936 -s ours am: c5eb29a331 -s ours
am skip reason: Change-Id I0bffe618276cda41bac56efe069121073aa39930 with SHA-1 cb7066ef20 is in history Original change: https://android-review.googlesource.com/c/platform/cts/+/1325311 Change-Id: Ia883b3ab30e96c89027e5805fb61239c38c187fa
This commit is contained in: