Merge "Undeprecate storage directory APIs" into sc-v2-dev am: 19325e4648

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080410

Change-Id: I3c18042f36ccaaa0d4ff20fb5694285d68eb3af2