Merge changes from topic "api29"

* changes:
  AOSP/Camera2 - Update Storage method to be compatible with API 29
  Revert "Revert "Camera2: Migrate to new storage API""