Merge "Revert "AOSP/Camera2 - Updated to sdkVersion 29.""