tree 382e9b79e39a3b84e1df8f8737242e532dcd9670
parent 92674516a3f93c6799a2dca05e4c77d6424d8145
parent ac67934dae514c925c4b377bd3ab773e7c311ef5
author Collin Fijalkovich <cfijalkovich@google.com> 1609984134 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1609984134 +0000

Merge "Allow Traceur to take START_FOREGROUND_SERVICES_FROM_BACKGROUND" am: c9edda6886 am: 2159e77523 am: ac67934dae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie627bd4e5f0fd6352870b49c35c7eb24f5f7c8df