Merge "Merge "Remove the input consumer surfaces when the consumer is...
Merge "Merge "Remove the input consumer surfaces when the consumer is disposed" into rvc-dev am: 616fcd81 am: a7f4ee62" into rvc-d1-dev-plus-aosp am: 9e45dd5a
Change-Id: I11164ffd05eb6879baa99490995847ba0eae038a