[automerger skipped] Merge "Fix gson usage with R8 full mode" into tm-qpr-dev...

[automerger skipped] Merge "Fix gson usage with R8 full mode" into tm-qpr-dev am: 71833c1d am: 2a2a0241 -s ours

am skip reason: Merged-In I824b870a355a4cfea04e55d5648a6c441ab446d3 with SHA-1 994594ba is already in history

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



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