Merge changes from topic "am-518670f4326b4d6581e6b0e55a5c0483" into rvc-qpr-dev-plus-aosp

* changes:
  [SP25] Rename functions that add Entry conditionally am: 32fb2a0e am: 9268b048 am: 5d50c665 am: f1b74ae3
  [automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 88f89a0f am: b58debe4 am: e2d6aa5c am: 160cea05 -s ours
  [automerger skipped] [SP23] Address misc API review comment about NetworkStats am: 90a118d4 am: 690e1d05 am: d96e4e72 am: 9a073d84 -s ours
  [automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: ea8f185b am: af679c10 am: e4c11498 am: b47425dc -s ours
  [automerger skipped] [SP20] Check signature permission when accessing network stats provider am: af8d85fa am: de2de63f am: beef6b92 am: 0359bec1 -s ours