Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea am: 0e9bda18ea" into nyc-mr2-dev-plus-aosp
am: 70f16f0d5f -s ours
Change-Id: I02bc6c0b300cf3a0bf4a1de2cd713877a576b7df
This commit is contained in: