am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev * commit 'd90959c9':