Merge changes from topic "api29" am: 55d843fcf1 am: d96b5af9c4 am: b0382e4d82

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

Change-Id: Id5489bab88a226880128d6d5cc173e626d388538