Merge "Merge "Not bypassing while the camera is being launched" into qt-r1-dev am: a19fbdf51b" into qt-r1-dev-plus-aosp
am: d16afdfda7

Change-Id: If76497558066e9da7b45337e1d9c55566b1ab78d