Merge changes from topic "am-46700c9df592486c8f7154c692b55c14"

* changes:
  [automerger skipped] Merge "DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS" into tm-qpr-dev am: d319f10c -s ours am: 0966af24 -s ours am: 56b703ba -s ours am: 40a07020 -s ours
  [automerger skipped] DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS am: dc62f2e6 -s ours am: afa8cc90 -s ours am: 8e5079f3 -s ours am: 350aa94e -s ours