Merge "Add Spam#updateSpamSync API to control when syncing the Apdl spam list is enabled" am: 7be4f8eb0b
am: ee03ca34fa

Change-Id: Ibe8ed8f8aec07a31092c58f79771863758f9fe10