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