[automerger skipped] Skip ab/6749736 in stage. am: 9e04ce7d66 -s ours am: 9a5211fcdc -s ours am: 7641634c69 -s ours

am skip reason: Change-Id I5aa308a65023521d6e35228754e0570a7083acb4 with SHA-1 e52e79c058 is in history

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

Change-Id: I3079c1fd32529b83290db0ab72410dcbe007ae29