Merge "Camera2: Remove 2 keys from BC key list" into lmp-dev