[automerger skipped] Drop input for toast and child surfaces am: 55c1473b...

[automerger skipped] Drop input for toast and child surfaces am: 55c1473b am: b5d28939 -s ours am: bf8f40cb -s ours am: 6a39870b -s ours am: 170b802c -s ours

am skip reason: Merged-In I316b76b685ca5030fd8aa91283555efcce4d6994 with SHA-1 6ac8376c is already in history

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

Change-Id: I16fca9ab08ce908f639baeb9d46f2a35e08adc16