[automerger skipped] Merge "Merge "Camera: fix use after free in sensor...

[automerger skipped] Merge "Merge "Camera: fix use after free in sensor timestamp" into rvc-dev am: 0fa486f5 am: 94d1d81a" into rvc-d1-dev-plus-aosp am: f8bc80ba -s ours

am skip reason: Change-Id I0f944fc9133d3ab279859f20236d956d7ca338f8 with SHA-1 c530c597 is in history

Change-Id: Ie96af99e3eec96fdf6f4b18c66f80f58af3a7548