Mark ab/6881855 as merged am: 4bbcc843df am: ef55f31eef Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/13112971 Change-Id: Ifee118d5123957c4294594b6f7534e9155f81969