[automerger skipped] Merge Android R am: 9fc0536057 -s ours

am skip reason: Change-Id I85931efe010e5474fe552f519b3734ff04397e54 with SHA-1 3a2cfa99da is in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/abi-dumps/platform/+/1422482

Change-Id: Id6b8bb1b4ff8f34a478af3e267e50592378f0598
tree: c66a3e242ab8ca9667fcb88fc4896bfca03c9d78
  1. 30/
  2. S/