Merge "Camera: speed up ITS 3A convergence" into stage-aosp-pi-cts-dev
am: bc4f1054ab

Change-Id: I841397a9fb234011a453ce9ba9134036a4b23449