Cluster all non-applications under single "Android OS" label, and correctly label uninstalled applications. Match API changes that now return correct historical usage around current time. Bug: 4975314, 4691901 Change-Id: Icec1c54ff3404e1525878516b0a438f757dcb758