Merge mainline-release 6664920 to master - DO NOT MERGE am: 9dbd87edc3

Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/1430143

Change-Id: I3f6a9433b36947f5e1ae232df6d4ce3d77940786