[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 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: Idaaf679a334cac51c220f9b5222e41671d087416