Merge "Merge \\"Camera3Device: Correctly shut down abandoned streams\\" into nyc-dev am: b889242aff am: b461a998a5" into nyc-mr1-dev-plus-aosp