tree 0841ef2dc6b13ca6ab4163a6d44ecda6814825f5
parent b01254f350d8dcfb192c969c58b5c08c2a287403
parent 6ba0487c9134a64675006a98c86488715075ac62
author Junyu Lai <junyulai@google.com> 1641477399 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1641477399 +0000

Merge changes from topics "ms34-tm", "ms40-clock"

* changes:
  [MS09] Expose NetworkTemplate APIs which are needed by NetworkPolicy
  [MS34.1] Replace TelephonyManager#getSubscriberId(subId) with public API
  [MS40.1] Remove Clock dependencies from NetworkStatsService
  [MS27] Expose noteUntaggedSocket SystemApi