Merge "Address AppEventProducer to correctly send search-result location on AppTargetEvent" into sc-v2-dev am: 664f685336 am: 9dfc2ba0a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16235837

Change-Id: If3ddb608ddebbf2e8d171ba10379b4d89a3b5a31