[automerger skipped] Merge "Add hashcode into album id to distinguish same-named albums" into mainline-prod am: b5216ca895 -s ours

am skip reason: Change-Id Ib10446f9608ad1ad88267ef5a187cc3a5a785158 with SHA-1 7c9635a25c is in history

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

Change-Id: Ie2dce954164010cf754770829436ad88f31fd2b7