[automerger skipped] Merge "Merge "Unify toast presentation code" into rvc-dev...

[automerger skipped] Merge "Merge "Unify toast presentation code" into rvc-dev am: 9b256a21 am: ce92347e am: 251a2c23" into rvc-qpr-dev-plus-aosp am: 405d994f -s ours
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 aea2c50c is in history

Change-Id: Ib50800b1cb23b5aff669483756d5d6cb2356b14d