[automerger skipped] Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: af7610e9c5 am: 6307b49aea -s ours am: b8ab173670 -s ours
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 dee28c91a3 is in history
Change-Id: I935bd5e0ba146ab7eccd4770128418a238528af8
This commit is contained in: