[automerger skipped] Fix Redaction calculation. am: 0b255a1378 -s ours

am skip reason: Change-Id I7ff2107cb62629b3ec7d9beba898d688a3aa1add with SHA-1 11700c0f40 is in history

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

Change-Id: I2f54e376db76a247fafbfc096235ef87858c0a81