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: I1faf777b7ff87b8ed02247d04a495df56e80f559