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

Change-Id: I3762678c41ec1f8ab1293bad023d9db0128b0dd3