Merge "Camera: Avoid enabling unsupported CAF modes during image capture" into rvc-dev am: 1a463d7444 am: 310290da83 am: c7d2089f38

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

Change-Id: I547f76f1e1cd6cd611f71cbc9ac07a4649fbd26b