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