Merge "Revert "OMS: integrate OverlayManagerService into framework""