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

am skip reason: Change-Id If92e9b343745d18dc001847da8d7f061ae52ea52 with SHA-1 64df21bcd7 is in history

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

Change-Id: I52bf2b28416591e4bb341396a7473c89853a12b1