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

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

Change-Id: I5cdb1d3cc483fb724e484de0198e6b19745ed977