[automerger skipped] Merge "Add a flag byForegroundService to...

[automerger skipped] Merge "Add a flag byForegroundService to enqueueNotification() call." into udc-dev am: a1493620 am: 2a5e8071 am: df8406bf -s ours am: 967cd27b -s ours

am skip reason: Merged-In Ibe30526ac0ff52e2e4fe9bc846576509cdf78236 with SHA-1 37f47916 is already in history

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



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