Merge "Add hashcode into album id to distinguish same-named albums" into rvc-qpr-dev am: b0543aee00

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

Change-Id: Ib35565136c64612fb9e8cda78419b915b962d11a