Snap for 10453563 from ea9597a8c71ac7c93349fce499241341793dcf67 to mainline-extservices-release

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