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

Merge "Merge "Merge "Revert "Revert "Add "incrementEventCountBy" function to Onboardi..."" into tm-dev am: 223bfe09 am: 5b39a7db" into tm-d1-dev-plus-aosp am: a0a4ff88" into tm-qpr-dev-plus-aosp am: 19d08c10

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



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