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

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



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