Merge "[automerger skipped] Merge "DO NOT MERGE: CameraITS: support wide FoV ITS 20cm deep box" into oreo-cts-dev am: 6db0f5084e  -s ours" into oreo-mr1-cts-dev am: 9f3e99d3a9  -s ours
am: 63bd31d57d  -s ours

Change-Id: Ia06eaf2bf5e4acd52d57f5675542062faffdaf17