Merge "Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an...

Merge "Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 98747229 am: bcc0e5a7 am: 883a7241 am: ba9aa89c  -s ours am: 034401cf am: 4443c42d am: 75a07e44 am: c46b8a32" into nyc-mr1-dev-plus-aosp
am: 1fa97386  -s ours

Change-Id: Ie8e59fe944bfb410aa11dd3253d9efcede8af12a