Merge "Revert "Camera2: Migrate to new storage API"" am: 7bc5afaaa6 am: febbc4ab35 am: 5e4e54e467

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

Change-Id: I45785fc5ca5135b54e3a988278eb3792e213bf00