Merge pull request #7380 from zackhow/analytics Android: Analytics - get android ui type when called instead of setting it ahead of time
