Don't include flags in configuration change if their value hasn't changed.

This makes the check in updateFrom() match the logic in diff().

Change-Id: I3ab4e8460f7fbf985ef55b9514a8aa90d401d486
Merge "Don't include flags in configuration change if their value hasn't changed." into cm-10.1
Merge remote branch 'cm/cm-10.1' into cm-10.1