Merge changes from topic "am-9684290afe3246a5b6ccca94a7a22cf0"

* changes:
  [automerger skipped] Merge "DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS" into tm-qpr-dev-plus-aosp am: b55ddcc9 -s ours am: a2714fc5 -s ours am: 8bbf7f68 -s ours
  [automerger skipped] DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS am: 4de5d6dc -s ours am: 32414391 -s ours am: 13775896 -s ours