Merge changes from topic "2nd-landing-fix" into main

* changes:
  Fix testUpdateDeviceStatsPermission for TrafficStats cache mechanism
  Revert "Temporary disable rate-limit cache for TrafficStats"