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

Change-Id: I6369ff7c1778c1c263ea0d78e9e162d9f4747ff6