[automerger skipped] Drop input for toast and child surfaces am: 55c1473bf2 am: b5d28939ac -s ours am: bf8f40cb63 -s ours am: e0e8d71d62 -s ours
am skip reason: Merged-In I316b76b685ca5030fd8aa91283555efcce4d6994 with SHA-1 6ac8376cd7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16502616
Change-Id: I2bbea714da285b8407e84837fbb47b2a094def6e
This commit is contained in: