Merge \\\"Camera3Device: Correctly shut down abandoned streams\\\" into nyc-dev am: b889242aff am: fe82275a06
am: acd69cc456

Change-Id: I05f4a6dcb216a2d79692b649e629729aa95f2809