Merge "Camera: Avoid enabling unsupported CAF modes during image capture" into rvc-dev am: 1a463d7444 am: e32bf6cd28 am: af61762b41

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Camera2/+/11707502

Change-Id: Ib596770e3f4d1d67a6df5f01fc43a00f8e29b519