Merge "GnssStats atom entity name change" into rvc-dev am: 6dca466770 am: 617a72f3dc

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

Change-Id: I789d9d70a9e41d748867493e22b2314c653110db