Merge changes from topic "am-364a9f66c05e4141b93ffe168c090587" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Condition background record restriction on Sdk" into sc-dev am: 0aea3fff am: 58552d0d am: e8d4fc51 -s ours am: cf2d02ad -s ours am: f35f49e5 -s ours am: 1e6a675f -s ours am: dd833ba6 -s ours am: 788af55d -s ours am: 177f29f4 -s ours
  [automerger skipped] Merge "Correct attribution source for MMAP thread" into sc-dev am: 0454d934 am: 47c7ac57 am: 869736d0 -s ours am: 721430b7 -s ours am: 6d13d2af -s ours am: 94788727 -s ours am: b77ce066 -s ours am: 55999526 -s ours am: 6840bf8e -s ours