Add force option

Change-Id: I229da5a6379e16b4bf4a3ae768e49f27f4af68d3

Conflicts:
	core/java/android/util/ExtendedPropertiesUtils.java