[automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 544989351f am: 0def2a4e91 -s ours

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

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

Change-Id: I9a5838ea3a86a64214181135ff87d2fb52cfcddd
tree: 2cfac7e4001b1bc29542035d2b7aa55589a6743b
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING