Merge "Fix Toast memory leaks" into udc-dev am: 6488edd6 am: c70c5f61 am:...

Merge "Fix Toast memory leaks" into udc-dev am: 6488edd6 am: c70c5f61 am: 7c7650c4 am: 5b002dbc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22894949



Change-Id: I70bd902ff217f7a7e1cace21346e2356bf86cc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>