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 am: 621d67d9

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



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