Merge "Only persist last Shared Preferences state am: 31d6889f4c" into nyc-mr2-dev-plus-aosp