Snap for 10447354 from ea9597a8c71ac7c93349fce499241341793dcf67 to mainline-resolv-release

Change-Id: I1666093aa20333707492f9e4e0a57bdac88b2984
tree: bcce12550e3eba971199fd8acc8ffd6697862cec
  1. android-5.10/
  2. android-5.15/
  3. android-5.4/
  4. android-mainline/