Merge "Method to override feature flag" into tm-qpr-dev am: fb9c4d25c4 am: ebd8065f19

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

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