Snap for 8564071 from 4bede96b386b11061c5f204d8731eaa8c316d4bf to mainline-resolv-release

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