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

Change-Id: Ie493e2919afa98c13f159b9c2b51b6d21ba70d70