Merge "Validate input for ContentService#setIsSyncable" into nyc-mr1-dev
am: 76043cf69f

Change-Id: I89c6415c45320a1825bf2bca26ec64a9e308d46d