Merge "AOSP/Camera2 - Updated to sdkVersion 29." am: ce2060ef5b
am: 50ab22edc4

Change-Id: If10988cffb0b00dcc6b4a7d8c514544b030d94f1