Merge "Improve count of openSession callers in dumpsys"