[T4043] change account_analytics logics for picking_type

Luciano Ortizrequested to merge
cherry-pick-9a984185 into 12.0

(cherry picked from commit 9a984185)

Merge request reports