Merge "Merge "Revert "Revert "Add "incrementEventCountBy" function to...

Merge "Merge "Revert "Revert "Add "incrementEventCountBy" function to Onboardi..."" into tm-dev am: 223bfe09 am: 10854240" into tm-d1-dev-plus-aosp am: 9c5102a0

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



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