Merge "Camera: Migrate BOKEH_MODE to EXTENDED_SCENE_MODE" into rvc-dev am: ed52cf6f83

Change-Id: Ia20cca3149028eae39adfa21ebd838e5373ea0a8