Merge "Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (framework)""