am 8d392ccc: Merge "analytics: avoid account_type switch on notification creation" into jb-ub-mail-ur10

* commit '8d392ccc4e48c8a2185e8b1236e0f697b38d8b94':
  analytics: avoid account_type switch on notification creation