Merge "Remove "primary_directory" and "secondary_directory" from initial values" into rvc-qpr-dev am: d49d22ea9a

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

Change-Id: I2f79a203cbbef32c370274b447f631dc48c0796f