Merge "Camera features: Relax relationship between AR features" into pie-cts-dev
am: 8c6e0ea760

Change-Id: I4e837b53b95d4e12329fd9d8ea3776bbb13cc25d