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

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

Change-Id: I1eaf2631858b507f3ae9b6ce9eff62815a47b5d0