Merge changes from topic "dir_fix" into main am: e2a69a047e

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

Change-Id: I976a4f1b0924d28f70e103d327dc8921ec1115b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>