Merge "Always use setResultEx" am: dcf1bbf9b1 am: 2a9c47c354 am: 575d3c1fbc

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/2400471

Change-Id: Ibea6545a083ab265da6f7b0cab30e76150d36e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>