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

Change-Id: I9196d40986ae51f5e308a48940a7c6f8d88609c0