Merge changes from topic "am-ba41ab72133c4211aba3ec5409a124a5" 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: 3e323e06 -s ours am: 60872a19 -s ours am: 8cf48c01 -s ours am: 432b7feb -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: c6326884 -s ours am: 3b6c97c6 -s ours am: 34c8046c -s ours am: 6f344b01 -s ours