Merge "Fix extractRelativePathForDirectory for single char directory names" into rvc-dev am: 4c55011a49

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/11951718

Change-Id: Id87394750654cc854ab2256a5f8ec9d5e52ff20a