[automerger skipped] DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS am: dc62f2e638 -s ours
am skip reason: Merged-In I11f5d3f19cb38cfb7e37489cbf029f7b2692f67c with SHA-1 4de5d6dc86 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21746716
Change-Id: I7d454443a262fd7eca0e985d7ab3abcfc3a42c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: