Merge "Add support to override Build.VERSION.MEDIA_PERFORMANCE_CLASS" am: 434a6a79c4 am: d5cd517582 am: 2afa8dbd97 am: ceba1a0c8d am: ac140c5d88

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

Change-Id: Icd0fbf0871ee36d458cceb927d466c72b448fdb6
Merged-In: Icd0fbf0871ee36d458cceb927d466c72b448fdb6
Merged-In: Ib3da031e12790b27fc4363172f9c5af957661631
Merged-In: I5b7bbc4e52d5816cecd8b6d0b900e0e6b1495b79
Merged-In: I7324cc1c2cb0ef6847c3831f710f81069495b390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit c693f2eb51be7ae3e82e93c709d2a83803ed0411)
2 files changed