am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev
* commit 'a11111f9':
DO NOT MERGE: Camera: fix focusArea wrong indexing issue
DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.
DO NOT MERGE: camera2/3: Add protection for still capture path