Merge "Camera: Handle consumer side detach in BufferManager" into oc-dev
am: e97d86657d

Change-Id: I7bbaa955597393746193ff365c533491e1d62389