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

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

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