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

Change-Id: Ic8ac22e2efa8e4def092469f3c346acb2e6bdc07