Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into mnc-dev am: 987472290c am: bcc0e5a7ab am: 883a724193 am: ba9aa89cfe  -s ours
am: 034401cfaf

Change-Id: Ie955306192481a37d2e59e052fd06fc40cde460b