[automerger skipped] Merge "DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a...

[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: 34ed1780 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21757719



Change-Id: I7a81619d6229f7f53f599a12fae17cd4da1bc5d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>