Snap for 10453563 from ff822d1ec33dc9a8225d34a1c576f8af26fdb0fd to mainline-appsearch-release

Change-Id: I3975e6e08f360ef6c8be2536a2f492ff443396fd
tree: a4c86c8609abb31286ad4d88980bfbb5a04348b6
  1. 4.19/
  2. 5.10/
  3. 5.15/
  4. 5.4/
  5. 6.1/