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

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

Change-Id: I16db9d2c5fc6ae3f4916950182968ec2661f656a