[automerger skipped] Merge "Unify toast presentation code" into rvc-dev am:...
[automerger skipped] Merge "Unify toast presentation code" into rvc-dev am: 9b256a21 am: ce92347e -s ours
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 dee28c91 is in history
Change-Id: Id8dd0ec61c0b8b9b63439907b4f9c1d66513ecfe