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

Merge "Fix Toast memory leaks" into udc-dev am: 6488edd6 am: 02d4bc63 am: 3c742245 am: c507c46e

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



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