[automerger skipped] Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: ce92347e60 -s ours am: 2b8a0e63e2 -s ours am: dbac977000 -s ours
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 dee28c91a3 is in history
Change-Id: I17a437f6fc9f33e517291c90f87cb8efbca0e4d8
This commit is contained in: