[automerger skipped] Merge "[Media Quality] Move away from Guava" into main...

[automerger skipped] Merge "[Media Quality] Move away from Guava" into main am: e95acbef am: f6276953 -s ours

am skip reason: Merged-In I6e524b2273575681ad8bcaef54f5e96530d6c791 with SHA-1 7b526fce is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3541645



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