Merge "Camera: fix frame capture trace pair" into pi-dev
am: 8d1c940af4

Change-Id: Iffa7958a0c94dfb476569590c8f8e141884a30e1