Merge "Add ForegroundService Type" am: 07597e02c5 am: 4e3058b770 am: 6060e50086

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2510695

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