Snap for 8512216 from 4bede96b386b11061c5f204d8731eaa8c316d4bf to tm-frc-adbd-release

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