Merge "AOSP/Camera2 - Remove Saving bar after taking a photo" am: e06fd1d768 am: b63aca0735

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

Change-Id: Icf5e0a7e5ca76ead5dd686a2c26da0f0db5e16f9