Merge "Fix "dumpsys activity provider""