Merge changes I806a9f32,I9536ce6a

* changes:
  Switch to source-built GSON.
  Bugfix:com.android.server.nearby.fastpair.cache.FastPairCacheManagerTest#getAllInfo fail