Merge "Fix gson usage with R8 full mode" into tm-qpr-dev am: 71833c1d

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



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