Merge changes I089f3922,I3a52a472 am: a194bc71da

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

Change-Id: I212bee17686adcf19c29121a5664b44e0b2859a8