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

[automerger skipped] Merge "Add a flag byForegroundService to enqueueNotification() call." into udc-dev am: a1493620 am: 181037c6 -s ours am: aec2cd1f -s ours

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

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



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