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

Change-Id: Ia0f07526268a22b71d181e0ce2f2b9f160983fbf