[automerger skipped] Merge "Ensure default folders and Camera folders are always visible" into rvc-qpr-dev am: da2bbfd71d am: f00c2d6c62 -s ours

am skip reason: skipped by user sahanas

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

Change-Id: I35b7028863d728420e3b0b0263db6c43c3049e54