[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 am: d319f10c -s ours

am skip reason: Merged-In I11f5d3f19cb38cfb7e37489cbf029f7b2692f67c with SHA-1 4de5d6dc is already in history

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



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