Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
am: a606d1049f

Change-Id: Ib1685574483b83968b4fc14f788d3496a436c096