Merge changes I17c7888b,I67a28c64 am: 36e7ff02fa am: caff0abba2 am: a063dad4b4 am: ed1bb9e64f am: 7e84f2ac31

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

Change-Id: Ia5a8b8cc29da8bb2fbbaa2f99916145e25baed5f
Merged-In: Ia5a8b8cc29da8bb2fbbaa2f99916145e25baed5f
Merged-In: I6009fafbb7edb4028d009b5e512528e91707d428
Merged-In: Id2af88f18ad5b0644e0e763d29ed0d57cb090c87
Merged-In: I8da5fa09805f87f058d3021ee65d546e6c95e071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit 3314408e1ccbfe99aa006e35fc1ff64795a3a545)
3 files changed