[automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd"...

[automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 94deae92 am: a0b5f08e -s ours am: 4aaba54e -s ours am: 0594ad0d -s ours

am skip reason: Merged-In Ic13f1d9832d5ae5b6ae4b96323025d9b695fdaf9 with SHA-1 67d3b195 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703089

Change-Id: I1ff9a13cf63497f09167844741e31b29d6632f70