Merge "Remove the input consumer surfaces when the consumer is disposed" into...
Merge "Remove the input consumer surfaces when the consumer is disposed" into rvc-dev am: 616fcd81 am: a7f4ee62 am: 2d3346fa
Change-Id: Ic23d7692353968c1d1c91c798cac1be38918a289