Merge "Make android:cantSaveState an optional feature." into pi-dev am: 71408255ea
am: cb9a80e934

Change-Id: Idec14333adf37520fa2ad31d8aadaf176187e16d