Merge "Persist warning alert dialog across rotations. am: b37b09e7 am: 4b8be673 am: b4ea6dd2 am: 5e17bd89 am: 3401026c am: 27cbcd8d" into nyc-mr2-dev-plus-aosp