Merge "Simiplifying the Parner override definition so that it can be used for...

Merge "Simiplifying the Parner override definition so that it can be used for multiple overrides" into tm-qpr-dev am: 11786572 am: 4c44df1e

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



Change-Id: If020405c00ca1fdf00e58ea3d16de77babaa4a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>