Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: 631370fa36" into nyc-mr2-dev-plus-aosp
am: b1b2414a08 -s ours
Change-Id: I0c7dc18088ca0343baa7347da17bc1d2a057bdd5
This commit is contained in: