[automerger skipped] Merge "Camera: Flush in-flight requests during device detach" am: c8a6745ac7 am: 0cc6d8c35d
am: db298d7b2d  -s ours

Change-Id: I0197b2d16ea205ffd1ff23518b3e41a75ae5887e