[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: 0966af24 -s ours am: 56b703ba -s ours am: f23ba111 -s ours

am skip reason: subject contains skip directive

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



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